This patch renames balloon command to "set-mem", so instead of "xm

balloon", we will use "xm set-mem" (as suggested by TODO list)

Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

diff --git a/docs/src/user.tex b/docs/src/user.tex
index f15f88a8463ed8139c43016a98868593a08e5fb6..32c0decde7bc3d93e9b12b7cf7c1209311f63003 100644 (file)
--- a/docs/src/user.tex
+++ b/docs/src/user.tex
@@ -930,12 +930,12 @@ memory at the request of the administrator or the user of the domain.
 \subsection{Setting memory footprints from dom0}
 
 The machine administrator can request that a domain alter its memory
-footprint using the \path{xm balloon} command.  For instance, we can
+footprint using the \path{xm set-mem} command.  For instance, we can
 request that our example ttylinux domain reduce its memory footprint
 to 32 megabytes.
 
 \begin{verbatim}
-# xm balloon ttylinux 32
+# xm set-mem ttylinux 32
 \end{verbatim}
 
 We can now see the result of this in the output of \path{xm list}:
@@ -951,16 +951,16 @@ The domain has responded to the request by returning memory to Xen. We
 can restore the domain to its original size using the command line:
 
 \begin{verbatim}
-# xm balloon ttylinux 64
+# xm set-mem ttylinux 64
 \end{verbatim}
 
 \subsection{Setting memory footprints from within a domain}
 
-The virtual file \path{/proc/xen/memory\_target} allows the owner of a
+The virtual file \path{/proc/xen/balloon} allows the owner of a
 domain to adjust their own memory footprint.  Reading the file
-(e.g. \path{cat /proc/xen/memory\_target}) prints out the current
+(e.g. \path{cat /proc/xen/balloon}) prints out the current
 memory footprint of the domain.  Writing the file
-(e.g. \path{echo new\_target > /proc/xen/memory\_target}) requests
+(e.g. \path{echo new\_target > /proc/xen/balloon}) requests
 that the kernel adjust the domain's memory footprint to a new value.
 
 \subsection{Setting memory limits}
@@ -1285,7 +1285,7 @@ custom variables (for instance, the \path{xmdefconfig} file uses a
 The available commands are as follows:
 
 \begin{description}
-\item[balloon] Request a domain to adjust its memory footprint.
+\item[set-mem] Request a domain to adjust its memory footprint.
 \item[create] Create a new domain.
 \item[destroy] Kill a domain immediately.
 \item[list] List running domains.

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index a831cde8aa0c9928382865041726ab175d0d11f6..141da198ca96c01b504830fb30a398649bfad86f 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -563,9 +563,9 @@ class ProgMaxmem(Prog):
 
 xm.prog(ProgMaxmem)
 
-class ProgBalloon(Prog):
+class ProgSetMem(Prog):
     group = 'domain'
-    name  = 'balloon'
+    name  = 'set-mem'
     info  = """Set the domain's memory footprint using the balloon driver."""
 
     def help(self, args):
@@ -579,7 +579,7 @@ MEMORY_TARGET megabytes"""
         mem_target = int_unit(args[2], 'm')
         server.xend_domain_mem_target_set(dom, mem_target)
 
-xm.prog(ProgBalloon)
+xm.prog(ProgSetMem)
 
 class ProgVcpuhotplug(Prog):
     group = 'domain'